Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add role_templates in SecurityPutRoleMappingRequest #2357

Merged
merged 1 commit into from
Dec 7, 2023
Merged

Add role_templates in SecurityPutRoleMappingRequest #2357

merged 1 commit into from
Dec 7, 2023

Conversation

pquentin
Copy link
Member

@pquentin pquentin commented Dec 7, 2023

Closes #2094

I've moved the RoleTemplate type in its own file under specification/security/_types as seems to be the norm for shared types. Note that role_templates and roles are mutually exclusive, but I'm not sure how to signal that.

@pquentin pquentin requested review from JoshMock and swallez December 7, 2023 07:22
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 7, 2023

Following you can find the validation results for the APIs you have changed.

API Status Request Response
security.activate_user_profile ⚪ Missing test Missing test
security.authenticate 🟢 15/15 15/15
security.bulk_update_api_keys 🟠 Missing type Missing type
security.change_password 🟢 6/6 6/6
security.clear_api_key_cache 🟢 9/9 9/9
security.clear_cached_privileges 🟢 3/3 3/3
security.clear_cached_realms 🟢 1/1 1/1
security.clear_cached_roles 🟢 2/2 2/2
security.clear_cached_service_tokens 🟢 4/4 4/4
security.create_api_key 🟢 25/25 16/16
security.create_cross_cluster_api_key 🟠 Missing type Missing type
security.create_service_token 🟢 2/2 2/2
security.delete_privileges 🟢 6/6 6/6
security.delete_role_mapping 🟢 9/9 9/9
security.delete_role 🟢 8/8 8/8
security.delete_service_token ⚪ Missing test Missing test
security.delete_user 🟢 9/9 9/9
security.disable_user_profile ⚪ Missing test Missing test
security.disable_user 🟢 3/3 3/3
security.enable_user_profile ⚪ Missing test Missing test
security.enable_user 🟢 4/4 4/4
security.enroll_kibana ⚪ Missing test Missing test
security.enroll_node ⚪ Missing test Missing test
security.get_api_key 🟢 14/14 14/14
security.get_builtin_privileges 🟢 2/2 2/2
security.get_privileges 🟢 12/12 12/12
security.get_role_mapping 🟢 18/18 18/18
security.get_role 🟢 20/20 20/20
security.get_service_accounts ⚪ Missing test Missing test
security.get_service_credentials 🟢 1/1 1/1
security.get_settings 🟠 Missing type Missing type
security.get_token 🟢 21/21 20/20
security.get_user_privileges 🟢 7/7 7/7
security.get_user_profile ⚪ Missing test Missing test
security.get_user 🟢 24/24 24/24
security.grant_api_key ⚪ Missing test Missing test
security.has_privileges_user_profile ⚪ Missing test Missing test
security.has_privileges 🟢 9/9 9/9
security.invalidate_api_key 🟢 10/10 10/10
security.invalidate_token 🟢 11/11 11/11
security.oidc_authenticate 🟠 Missing type Missing type
security.oidc_logout 🟠 Missing type Missing type
security.oidc_prepare_authentication 🟠 Missing type Missing type
security.put_privileges 🟢 10/10 10/10
security.put_role_mapping 🟢 11/11 11/11
security.put_role 🟢 26/26 25/25
security.put_user 🟢 39/39 38/38
security.query_api_keys 🟢 7/7 7/7
security.saml_authenticate ⚪ Missing test Missing test
security.saml_complete_logout ⚪ Missing test Missing test
security.saml_invalidate ⚪ Missing test Missing test
security.saml_logout ⚪ Missing test Missing test
security.saml_prepare_authentication ⚪ Missing test Missing test
security.saml_service_provider_metadata ⚪ Missing test Missing test
security.suggest_user_profiles ⚪ Missing test Missing test
security.update_api_key ⚪ Missing test Missing test
security.update_cross_cluster_api_key 🟠 Missing type Missing type
security.update_settings 🟠 Missing type Missing type
security.update_user_profile_data ⚪ Missing test Missing test

You can validate these APIs yourself by using the make validate target.

@pquentin pquentin requested a review from Anaethelion December 7, 2023 10:09
Anaethelion
Anaethelion approved these changes Dec 7, 2023
View reviewed changes
Copy link
Contributor

@Anaethelion Anaethelion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

As for the mutual exclusion, the spec doesn't carry the validation done server side.

@pquentin pquentin merged commit 4f9a95d into main Dec 7, 2023
9 checks passed
@pquentin pquentin deleted the security-role-templates branch December 7, 2023 10:44
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 7, 2023

The backport to 7.17 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.17 7.17
# Navigate to the new working tree
cd .worktrees/backport-7.17
# Create a new branch
git switch --create backport-2357-to-7.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4f9a95d4358707339d8d33c85deb4ccd6a226a79
# Push it to GitHub
git push --set-upstream origin backport-2357-to-7.17
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.17

Then, create a pull request where the base branch is 7.17 and the compare/head branch is backport-2357-to-7.17.

github-actions bot pushed a commit that referenced this pull request Dec 7, 2023
@pquentin @github-actions
Add role_templates in SecurityPutRoleMappingRequest (#2357)
0a086eb 
(cherry picked from commit 4f9a95d)
@github-actions github-actions bot mentioned this pull request Dec 7, 2023
Merged
github-actions bot pushed a commit that referenced this pull request Dec 7, 2023
@pquentin @github-actions
Add role_templates in SecurityPutRoleMappingRequest (#2357)
576e445 
(cherry picked from commit 4f9a95d)
@github-actions github-actions bot mentioned this pull request Dec 7, 2023
Merged
pquentin added a commit that referenced this pull request Dec 7, 2023
@pquentin
Add role_templates in SecurityPutRoleMappingRequest (#2357)
cc55f47 
(cherry picked from commit 4f9a95d)
pquentin added a commit that referenced this pull request Dec 7, 2023
@github-actions @pquentin
[Backport 8.11] Add role_templates in SecurityPutRoleMappingRequest (#…
4c6452b 
…2358)

* Add role_templates in SecurityPutRoleMappingRequest (#2357)

(cherry picked from commit 4f9a95d)

* Trigger CI

---------

Co-authored-by: Quentin Pradet <[email protected]>
pquentin added a commit that referenced this pull request Dec 7, 2023
@github-actions @pquentin
[Backport 8.12] Add role_templates in SecurityPutRoleMappingRequest (#…
d632e38 
…2359)

* Add role_templates in SecurityPutRoleMappingRequest (#2357)

(cherry picked from commit 4f9a95d)

* Trigger CI

---------

Co-authored-by: Quentin Pradet <[email protected]>
pquentin added a commit that referenced this pull request Dec 7, 2023
@pquentin
[7.17] Add role_templates in SecurityPutRoleMappingRequest (#2357) (#…
6e51d84 
…2360)

(cherry picked from commit 4f9a95d)
@JoshMock JoshMock mentioned this pull request Dec 7, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Anaethelion Anaethelion Anaethelion approved these changes

@JoshMock JoshMock Awaiting requested review from JoshMock

@swallez swallez Awaiting requested review from swallez

Assignees
No one assigned
Labels
backport 7.17 backport 8.11 backport 8.12 specification
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

put_role_mapping api does not have the role_templates field
2 participants
@pquentin @Anaethelion